Merge docs inline

svn path=/trunk/; revision=21971

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index e323eddb920737a643f28c6fd2e427bdaea77f50..6aaac55e1f435ed3dd964843b1a67dcb5946889b 100644 (file)
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,7 @@
+2008-12-28  Matthias Clasen <mclasen@redhat.com>
+
+       * gtk/tmpl/gtkfontseldlg.sgml: Merge docs inline.
+
 2008-12-28  Matthias Clasen <mclasen@redhat.com>
 
        * gtk/building.sgml: It's <envar>, not <envvar>

diff --git a/docs/reference/gtk/tmpl/gtkfontseldlg.sgml b/docs/reference/gtk/tmpl/gtkfontseldlg.sgml
index 6b44977f6f4512da1fdb5ce81e7c8808e333bb21..3438468ecc345076d688486e7cc76811905be5d9 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkfontseldlg.sgml
+++ b/docs/reference/gtk/tmpl/gtkfontseldlg.sgml
@@ -54,20 +54,20 @@ fonts.</para></listitem>
 
 <!-- ##### FUNCTION gtk_font_selection_dialog_new ##### -->
 <para>
-Creates a new #GtkFontSelectionDialog.
+
 </para>
 
-@title: the title of the dialog box.
-@Returns: a new #GtkFontSelectionDialog.
+@title:
+@Returns:
 
 
 <!-- ##### FUNCTION gtk_font_selection_dialog_get_font ##### -->
 <para>
-Gets the currently-selected font.
+
 </para>
 
-@fsd: a #GtkFontSelectionDialog.
-@Returns: the currently-selected font, or %NULL if no font is selected.
+@fsd: 
+@Returns:
 
 
 <!-- ##### FUNCTION gtk_font_selection_dialog_get_font_name ##### -->
@@ -80,31 +80,30 @@ Gets the currently-selected font.
 
 <!-- ##### FUNCTION gtk_font_selection_dialog_set_font_name ##### -->
 <para>
-Sets the currently-selected font.
+
 </para>
 
-@fsd: a #GtkFontSelectionDialog.
-@fontname: a fontname.
-@Returns: %TRUE if the font was found.
+@fsd: 
+@fontname: 
+@Returns:
 
 
 <!-- ##### FUNCTION gtk_font_selection_dialog_get_preview_text ##### -->
 <para>
-Gets the text displayed in the preview area.
+
 </para>
 
-@fsd: a #GtkFontSelectionDialog.
-@Returns: the text displayed in the preview area. This string is owned
-   by the widget and should not be modified or freed.
+@fsd:
+@Returns: 
 
 
 <!-- ##### FUNCTION gtk_font_selection_dialog_set_preview_text ##### -->
 <para>
-Sets the text displayed in the preview area.
+
 </para>
 
-@fsd: a #GtkFontSelectionDialog.
-@text: the text to display in the preview area.
+@fsd:
+@text:
 
 
 <!-- ##### FUNCTION gtk_font_selection_dialog_get_apply_button ##### -->